Auto merge of #1321 - dlevy47:bugfix/no-proxy, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 19 Feb 2015 15:44:24 +0000 (15:44 +0000)
committerbors <bors@rust-lang.org>
Thu, 19 Feb 2015 15:44:24 +0000 (15:44 +0000)
commit43755c00e8a93a3478a1179bca98a7f8b56ecbca
tree2795fcecfcb11a27c0e78b5f7c84e08399e74fd9
parent9f602293302cf65a8fbb5ec36d01d11a1a7fcab2
parent8eb28ad65952bbfac408013d0d1367b5f8f18df7
Auto merge of #1321 - dlevy47:bugfix/no-proxy, r=alexcrichton

Currently, cargo uses `curl_easy_setopt` to explicitly set the http proxy on a curl handle if any of the following are present:

* cargo config `http.proxy`
* git config `http.proxy`
* `HTTP_PROXY` environment variable

The act of explicitly setting the http proxy disables curl's logic for determining which proxy to use for a URL, and breaks the `no_proxy` environment variable. This PR privatizes `cargo::ops::registry::http_proxy` and adds an additional function `cargo::ops::registry::http_proxy_exists` to determine whether or not to use the `git2-curl` subtransport.